Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 18 Jan 2011 04:41:41 +0000 (20:41 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 18 Jan 2011 04:41:41 +0000 (20:41 -0800)

Trivial merge